merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 8 Feb 2011 06:46:05 +0000 (15:46 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 8 Feb 2011 06:46:05 +0000 (15:46 +0900)
commita3dcf7e096c9c4e63467e85ae2e90a03865c8687
tree50ca9e2599d4d136bd1fe0a9de8ddcf3849e8939
parent66ab610b26f3a558c648c8cc15f8f240e2edf19d
parentaa470327bef331b0cc1985a6505893dbd3b5cd91
merge trunk